Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Also build for CentOS 9. #283

Merged
merged 1 commit into from
May 4, 2022
Merged

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented May 4, 2022

Changes;

  • do not "provide" runc on CentOS/RHEL >= 8
  • do not build btrfs on CentOS/RHEL >= 8
  • set the correct build-dependency for BTRFS on SUSE flavors and "others"

rpm/containerd.spec Outdated Show resolved Hide resolved
rpm/containerd.spec Outdated Show resolved Hide resolved
@thaJeztah thaJeztah force-pushed the carry_270_centos9 branch 7 times, most recently from 64ec306 to 3fa047d Compare May 4, 2022 16:16
- do not "provide" runc on CentOS/RHEL >= 8
- do not build btrfs on CentOS/RHEL >= 8
- set the correct build-dependency for BTRFS on SUSE flavors and "others"

Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah marked this pull request as ready for review May 4, 2022 16:49
@thaJeztah
Copy link
Member Author

@ndeloof @tianon @rumpl PTAL; I think this one should be ready for review

@Romain-Geissler-1A
Copy link
Contributor

Hi,

For what it's worth, these changes look ok for me.

Cheers,
Romain

Copy link
Contributor

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit over my head on RPM spec knowledge, but seems sane? 🙈

@thaJeztah
Copy link
Member Author

Hi,

For what it's worth, these changes look ok for me.

Cheers, Romain

Thank you, Romain!

A bit over my head on RPM spec knowledge, but seems sane?

They're a big pain, so don't blame you (took me several attempts to get it right with all the different distro combinations 😓)

@thaJeztah
Copy link
Member Author

Let me bring this one in 👍

@thaJeztah thaJeztah merged commit e773c4e into docker:master May 4, 2022
@thaJeztah thaJeztah deleted the carry_270_centos9 branch May 4, 2022 17:02
alunsin pushed a commit to alunsin/docker-ce-build that referenced this pull request May 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants